Fix some compilation warnings
authorJavier Jardón <jjardon@gnome.org>
Tue, 19 Jan 2010 15:57:13 +0000 (16:57 +0100)
committerTristan Van Berkom <tristan.van.berkom@gmail.com>
Sun, 4 Apr 2010 00:55:22 +0000 (20:55 -0400)
The warnings was introduced with the changes in commit
a491091e292cad33c7c040b6deb05acb43aaec5f

demos/gtk-demo/toolpalette.c

index d04b7b77eb585f77313f45d4c576b522813853a6..1f779af8b48cd0afd4dbf5c04fda389e34eb6d58 100644 (file)
@@ -151,9 +151,9 @@ palette_drop_item (GtkToolItem      *drag_item,
 }
 
 static void
-palette_drop_group (GtkToolPalette *palette,
-                    GtkWidget      *drag_group,
-                    GtkWidget      *drop_group)
+palette_drop_group (GtkToolPalette   *palette,
+                    GtkToolItemGroup *drag_group,
+                    GtkToolItemGroup *drop_group)
 {
   gint drop_position = -1;
 
@@ -173,8 +173,9 @@ palette_drag_data_received (GtkWidget        *widget,
                             guint             time,
                             gpointer          data)
 {
-  GtkWidget *drag_palette = gtk_drag_get_source_widget (context);
-  GtkWidget *drag_item = NULL, *drop_group = NULL;
+  GtkToolItemGroup *drop_group = NULL;
+  GtkWidget        *drag_palette = gtk_drag_get_source_widget (context);
+  GtkWidget        *drag_item = NULL;
 
   while (drag_palette && !GTK_IS_TOOL_PALETTE (drag_palette))
     drag_palette = gtk_widget_get_parent (drag_palette);
@@ -188,10 +189,12 @@ palette_drag_data_received (GtkWidget        *widget,
     }
 
   if (GTK_IS_TOOL_ITEM_GROUP (drag_item))
-    palette_drop_group (GTK_TOOL_PALETTE (drag_palette), drag_item, drop_group);
+    palette_drop_group (GTK_TOOL_PALETTE (drag_palette),
+                        GTK_TOOL_ITEM_GROUP (drag_item),
+                        drop_group);
   else if (GTK_IS_TOOL_ITEM (drag_item) && drop_group)
     palette_drop_item (GTK_TOOL_ITEM (drag_item),
-                       GTK_TOOL_ITEM_GROUP (drop_group),
+                       drop_group,
                        x - GTK_WIDGET (drop_group)->allocation.x,
                        y - GTK_WIDGET (drop_group)->allocation.y);
 }